Skip to content

Add adaptive icons!#851

Merged
samtstern merged 23 commits intofirebase:version-2.2.1-devfrom
SUPERCILEX:adaptive-icons
Aug 4, 2017
Merged

Add adaptive icons!#851
samtstern merged 23 commits intofirebase:version-2.2.1-devfrom
SUPERCILEX:adaptive-icons

Conversation

@SUPERCILEX
Copy link
Collaborator

This PR is built on top of #850 and #814.

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
# Conflicts:
#	auth/src/main/res/layout/fui_phone_progress_dialog.xml
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
…ve-icons

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/mipmap-hdpi/ic_launcher.png
#	app/src/main/res/mipmap-mdpi/ic_launcher.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	auth/src/main/java/com/firebase/ui/auth/ui/idp/SupportVectorDrawablesButton.java
#	auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
@SUPERCILEX
Copy link
Collaborator Author

@samtstern This one's next! 😄

@samtstern
Copy link
Contributor

@SUPERCILEX ooooh pretty icons. Thanks!

@samtstern samtstern merged commit d58ee4b into firebase:version-2.2.1-dev Aug 4, 2017
@samtstern samtstern added this to the 2.2.1 milestone Aug 4, 2017
@SUPERCILEX SUPERCILEX deleted the adaptive-icons branch August 4, 2017 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants